Fixing Travis Build (somewhat)