Packaging fixes

As discussed in https://github.com/milkypostman/melpa/pull/2146