Upload bugfix and enhancements