Update to match latest Thesis.