migrations changes and fixes