some fixes in the ctor-emitter