Changes for CLISP