Fixes for evaluating calls