Misc fixes and updates