BS12 Merge

Nothing of note,
Some fixes.