Fixes for new tool architecture