Minor changes in the core tools ....