Misc fixes

Ops!