Fixes to RC code logic.