412940 minor threadsafe fixes

better protect event and listeners