fix up more references