A couple of fixes

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