Provide upload resource progress
Fix some regressions