Some more messy hacks