fix: address two FIXMEs at websocket events handling