Adding logic so we don't run out of memory when using super build on computers with large numbers of cores
Adding default case