Minor fixes in the EPP layer