Corrections to keys to include object partitioning.