Client reconnection notification cleanup + fixes