Fix callable call issues (#926)