Fix some more bugs for calling