(ReleaseTag) Minor fixes from self-review