Stupidity fixes

Yup that's right...