More changes to addapt BS3