bugfixes for canvasid/crosstool regressions