Review fixes for Trent