Beef up data validation/sanitization