Trying to find cause of subtle bug
Tidied up 689174. Fixed remaining small map bugs