PEP Fixes