GCS pass-through fixes for flight 18