Fixing map bugs