Fix static analysis issues#25

meysammahfouzi wants to merge 3 commits intoStacked-Org:mainStacked-Org/generator:mainfrom

meysammahfouzi:fix_static_analysis_issuesmeysammahfouzi/generator:fix_static_analysis_issuesCopy head branch name to clipboard