Sbase fixes