Fixes needed to be accepted by Melpa maintainer.