Fixed a couple of issues with tweeting