Minor fixes just to make TravisPy available on Python 3.