Merge branch 'sb/misc-fixes'