Fixed up some more server things.