Additional mutex fixes.