PEP fixes