Fiji coach Mac McCallion has made seven changes and demanded his team improve their discipline for tomorrow’s World Cup Pool B clash with Japan in Townsville.