+Prasanna: Fixing migration and build