more sanitization fixes