Fixes towards ScriptRunner