Some mods to random_map