Tentative fix to those two scripts