Fix analyzer bugs
Fix analysis results
Add missing forms