[FIX] More periodic partitioning fixes