(Issue419) Fixes from self-review