Fixes for pep