Legends and map fixes