Tweaks to the tweaks.
SDB needs a rewrite.