Misc fixes for addyosmani