*8345* Fixed reference problems