Toolkit adjustments for misc fixes