few minor stuff after the publish
Merge branch 'misc/post-publish-fixes'