Fixed elisp functions