Thesis another fixes