Multiple thread safeness patches