Fix GridHealper with some missing references