Debian jessie

Minor fixes required to make it work out-of-the-box (at least on Debian/Jessie / MELPA).