Some fixes on th datasets