More References Fixed