Mutex fixes