Some more sanitization, that was a fun one