BSR fixes 2
build update