Fix issues with Travis-CI build.