bugfixes to DeferredGenerator