Fix analysis errors
Add missing imperative
Remove duplicate analysis
Analysis fixes