Fixes for function call resolution

Checked in changes not solved founded problems.
Working on it...