Fixed BS2 issues, won't use BS3 yet