more locking tweaks