Cleanup
GAE config
Small fix