some misc server fixes