More GAE-readiness