Upload fix for drag and drop cases

More edge cases for handling file uploads

See #22