more fixes for maps