Fix references to run time data.