Script fixes for each program