more bug fixes around :file