Minor changes fixes to server setup different from last setup, should work with both.