Fixed errors found by ./.travis.sh