Start working on uploads migration plus other migration fix