Some problems fixed in tool-update