Sync RX7 from Live debug fixes