PEP* fixes pt. 1