Updates to make these scripts work again