some toolkit changes