Fixed privacy issues