Some tweaks to server to see if it will work between python 2 and 3