serverization more patches