Actually fixed elisp functions