Migration bug fixes. Saving place...