sanitize fixes