More PEP improvements