Fix most errors in tool-update