Fix Tools (For v0.6.8 final)