Fixes for shape editing