Scripting corrections