Major Bugfixes in Migration