More server edits to try and correct all these little things.