Addresses minor issues found with PR #130