Minor changes adapting to new server