Small fixes around gotools