Pep fixes