Some sanitize bugs fixed