Added xwhich to make sure we're searching the right paths for some tools