Fix: OutputLocation + Partitioning