Small Map Bug Fixes (All)