Small fixes
map incl