Fixes to address comments in pull request.