pod migration fixes