Use MAKE_JOBS in more places