Small fixes
map updates