Thesis: fixes