More GAE adaptations