Some tool amendments