Fix issues with travis builds failing on master branch.