Fixing 3 VS Code Analysis issues.