Fixed 2 bugs, causing EventListenerTestWithTCPSocketReplication#testRemoteNotifyRemove() test fail