Fix some linting errors