Some reference fixes