Minor fixes, removed server details.

More fixes to come later.