Fix small bugs in LockableTrait