Fixing comments by Kirill Kornyakov