More toku changes