Fixing assorted Travis-related issues