A couple of fixes so emacs can compile packages.