fixes requested by Yana in trello