Misc fixes 2