Misc fixes2