Fix failing scripts after merge