Changes required by CLISP