Script local eval corrections

*Fix #855