Some fixes to the auto pep8 work