Fixing more tools