Fixes of tools