Add some sanitization