Fixed compilation issues found by Travis CI