RBC compatibility modifications.