Mutex class rebuild + bugfix