updates for more reliable operation at NAIST