Fixes in response to pull request comments