Misc fixes

Misc fixes / typos