Fixes for memory handling, listener origin