Small scripting updates