Fix comments by @Kha