Fixed a couple bugs with locks
Bug Fixes