Various updates from comments in pull request