Corrects some bugs affecting deployment on GAE