Various fixes
Oopsie