Various fixes and new analyzer.