Some minor changes from Trello