fix issues caused by rc3