Fixes to the receive logic g2g