File validator improvements