minor analyzer integration changes