Propagated the changes on the previous commit to the other two scripts.