More misc fixes and updates