Fixes to address pull request feedback