more travis upgrade fixes