Fixes sample data and validation