Changes for some RC3 components.