More map locking