fix pep808 issues