Fixing some linting problems