Additional changes required by melpa