fixes to server side undetermined state