Some fixes for multi-mutex/require.