Small fixes from Trello