Activity share fixes