Modernized a couple of scripts