misc server improvements