Corrections for app-engine (3)