scripts: Add minor fixes