Added some tweaks to sbo building