Fixed minor tool bugs