More data sanitation