Fix issues reported from: https://github.com/milkypostman/melpa/pull/2146