Minor changes for pass-through and OA modes.