Corrections for app-engine