Improve granularity of GD function checks