Moar BS12:master fixes