Fixing grid problems