Fix Tools and Update Wrapper