Fix tests, etc, for mutex support.