Minor fixes
Interprocedural