Back-ported some uploader fixes
Further fix to forum virtual roots