Made some changes to multicore so that it works correctly with some
unknown change to the other code.`