Misc fixes 1