Minor changes from gae-init master.