Minor changes

Changes driven by Bug Sw development