little PEP fixes