include some small changes made at SBo