3 to 4 migration fixes