Fixed code-analysis issues for last commit