More Scripting Fixups