MorphShape fixes