more map 4 fixes