Misc fixes

Misc. small changes