Fixs from pull request comments