Various Server Changes

Various Server Changes