some minor mocifications in xbp