Other scripting fixes