[*] BO : various design fixs