Post Share Fixes