Fixing up .fromFile API changes