Fixes from Trello :)