Fix Migration issues

[MAGN-3159](http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-3159)
[MAGN-3009](http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-3009)