fixes from trello 27092013