Some fixes to the helper script.