More bug fixes for Body insertion/deletion of features