Fix for #861 #863 #862

Social sharing related fixes.