Fix issues addressed in pull request comments