Fix some non-elisp defuns