Fixes after merge pep8 errors