more reference fixes