More bug fixes. Fixed migration conflicts.