Small fixes to grid