Couple more reference tweaks