Updated cfg-IR verification + minor fixes

Change-Id: I6b2d03ea76dd04719054c89967d50c540c445688
36 files changed