Updated some things to match new Trident changes.