Minor fixes to lock types