Cleaned up some more lock semantics