Tweaks on tool scripts