Some fixes on PingPongRight