Minor fixes in the toolitp