Fix to include GNU elpa