Some pep8 compatibility changes