More data sanitizing...