7708294 Fixed more referencing issues