Fix 2 migrate view bugs