more mutex changes