Merge branch 'jk/janitorial-fixes'