Made various changes to enable serving via GAE.