more mutex compat changes