Final fixes to analyzer and updater