Fixes to improve the privacy window