Fixes for lisp scripts