Combine runtimes - Further fixes