Misc fixes and things