Fixed: Ensure loading of listeners from the old location during upgrade
Small fixes