fix analyzer deprecations (#1593)

5 files changed