More random fixes