Various reference fixes