Fix various feedback for GAE support

This fixes various feedback from GAE implementation.