PEP compliant fixes