More SBD tweaks.