Few tools fixes.