Misc GAE fixes
Misc fixes
Misc fixes
Misc fixes, esp to gae support