Fixing map stuff