Implement more fixes suggested by Tari.