More changes from review.
Fix crash when morphing from 2D.