Fix analyzer notes