More crazy fixes