[PATCH] More random map fixes