Fixed late tool bugs