Small changes to adapt to modifications in SBI package