Building fixes BSR
BSR fixes