20x - BS300 fixes