Added mutex protection to a few more operations