Fixing sbp issues