Made some fixes to function inliner
Fixed function inliner