Bugfixes that didn't make the split migration