Minor PEP fixes