Fix @himanshk and @sharoonthomas comments