Profile & Upload tweak