Fixes from Trello