Fixes to make sure that EPL saves