data partitioner misc fixes