more small server compatibility changes