Misc improvements

Context: https://github.com/milkypostman/melpa/pull/1206 /cc @yasuyk