Changes to potentially fix some GT stuff