Improvements to sandbox data generation.