Grid Bug Fixes