(Issue 326) Fixes from self-review / Merge conflict issues.