Bug fixes, see trello changes 13/2/2013