Tweaks to twitter integration