Fix travis

Fix problems found on recent Travis jobs.