Some extended upload handling

See: http://disq.us/8dv6w2