Adjust use-package and savehist