Some minnor changes to make project work on GAE