Misc fixes
Misc fixes