Fix a few CherryPy issues