File reference fixes