Some fixes to EPL generate