+Vinay: Fixing migrations for 1.10