Fixing source analysis issues; InvokeNode as INode, WIP