More migration bugs fixed, fixes #356