Small changes for Hana (from Trello)