Fix to header line for package.el compatibility, and other minor fixes