migration fixes