A few fixes to file dependencies