More spout support stuff
Make spout tools work again