Fixes for maps3.