Repair a couple of privacy warnings.