Fix some issues in sample data