fixes from https://trello.com/c/dgnSlnyV/4-anna-fb-twitter