Locker fixes