Fix the project to be more working with GAE