Some more work on fixing samples