Misc updates from PR comments