Some of trevi's unsynced changes