Fixed grid bugs