Some fixes on th datasets
Merge branch 'test' into dev