Fix problems found by travis build.