Thesis fixes