Fix merge fallout of privacy changes