Partitioning fixes