minor partitioner changes to handle corner cases