Fixes from PR review; additional comments