try fix all analyzer errors again