CTX upload fixes