Bugfixes in grid