Grid fixup