Fix a few things after running travis-lint