Fix a bunch of issues due to left over cruft from cherrypy integration