Some more hacks