More sample data fixes (as much as possible anyway)