Hopefully fixed Travis builds