Minor bug fixes during data set retrieval.