Travis CI fixes

This is a set of fixes to get Travis back to passing