Some random fixes