Misc fixes

Boop