emission lifecycle fixes

emission lifecycle fixes