Fixes to run on gae-init