Fixed even more GND problems

MORE GND!!!