More PEP page fixing