Fixes for AppEngine