Add fixes for .call not returning anything