Minor fixes post-deployment.
Merge branch 'social_live' into test_integration