Further fix for package.el compatibility