Correct some small issues causing travis build to fail.