Fixing issues found with Travis.