More file reference fixes