Grid performance fixes