Adding some Travis-specific fixes.