Shift location of where we make certain MAKE_TARGET is set.