some fixes and clean up under NONBE_FIX_ISM_XOVER_BR