BS12 Update

A couple of fixes.
Nothing of note.