Some pep fixes