Fixing marmelade and base.el