fix lint and scan issues