Fix commish tools