(Discussions) Fixes from self-review