WIP: Fixing the twitter issues