More wrench support, reduce log spam