Crazy fixes