Misc fixes
Fixes