Fixed bugs from pull-request comments