Final fixes to handle missing files