More reference fixes....