Tool fixes