(360) fix some references