Improved privacy handling.