small non-lisp changes