1713 file upload mods

From issue #1713.