Fix RC build