fix privacy issues