Fixup BS3 stuff