Magrathea locking tweaks