Grid bugs, multi-level entity diffs, other stuff