Fix many references