Yes, manual patching is a somewhat viable approach to this problem. But you should keep a text file somewhere with all the manual patches you apply.

These bugs have been reported on RT already and there are even .patch files attached to the ticket and a Github branch mentioned with "more" fixes.