Trying to fix issues with travis build.