Fix compilation errors found by Travis.