Further make_random fixes