Changes to meet current GD versions