Add some mixer locks
Revert earlier