bugfixes in server batchcall handling