Fix all the parts that Tran broke