Take fixes for root-trunk