Further little improvements in "Body ..."