Allow mixing joint and batched calling in a single configuration. Fixes for uploading joint called results. Thanks to Zhengqiu Cai