Some modify according to code-analyzer