Merge branch 'sb/misc-cleanups'