Minor changes to make the tool lifecycle work with the workflows