Hacks and fixes!