More minor fixes to grid system