Fix some problems with SB