Update to new mutex API