Fixed several fine-grained locks