some fixes for BTB