Initial fixes for other data set #1
Next set of fixes for other data set #1