* Fix an accidental change from [18009] and add a mutex destroy I forgot to commit