Misc fixes in analyzer