Misc fixes
Misc small fixes