Fixes to helper scripts.