Batch window FutureWatcher allocation
Fixes for ugly manual merge