sanitization fixes