partitioning fixes