Fixes/hacks around bugs, better late than never?