Bug fixes for Body feature insert/remove functionality