Fixed/tested mutex usage