More random fixes, updates