Fixed issues reported by Travis CI