Fixes to the insanity