Fixes for Maps functionality