Fixes in two scripts