Extra tools fixed