Fixed more bugs in fun calls