Fixing issues of statical code analyze