fix analyzer warnings
Merge branch 'feature/analyzer'

* feature/analyzer:
  fix analyzer warnings