Small changes to the file handler classes.