Misc fixes

Bloop.