Clean up guard deprivation warning
Fix social tab