Dataset loading Bug Fixes