Lint error fix after testing

Redoing successful fixes from last time after due testing