Fix 1.9.2 privacy issues