locking fixes