More script engine updates