Final adjustments to conform with AppEngine requirements.