Minor diagram changes