Minor indentation fixes
Misc fixes