Fix comments from @stof