BS3 fixes