Fix some issues from partitioner interactions