Minor fixes based on pull request comments