Some tweeks to get RC_Passthrough working