Another bag of Multi fixes - trying reducing GC with massive Promise creation