- Fixes to static analysis feature