Fixes for new data sets
More small fixes