More PEP fixes