Misc fixes

In connection with https://github.com/milkypostman/melpa/pull/2089