[PATCH] One more round of random map fixes