more Tool fixes