* Cleanup and mutex fix.