small fixes server side