Fixed a couple of problems with different package.el installs.