Fix #static code analysis