Mutex problems fixed