More thesis fixes