Continued fixing issues found by Travis CI