Fixing more migration stuff