Final patches to make trust router work