Additional UV1.3 migration fixes
Additional UV1.3 migration fixes