Fix various + Privacy improvements