More random fixes and updates