More reference fixes