Fixes for GNU ELPA