Some of the object creators were missing locks; fixed