Fix analyzers