BS12 Update

Fixes.
Nothing of note.