Some ID reference fixes