Small improvements to analyzer