Fixes to pass linting

Why is this removed?