ELDP.generator: Bugfixes