More WIP for #218 and #220. LEAK on  and  when subscribing to events