Minor tool fixes