Update some of the code to work with Kurt2.0.