Some sanitize errors fixed