Fix event service wrapper memory handling