Minor fix
Fixed code analysis warnings, created common code analysis dictionary