fixed mutexes etc