Apply fixes from mastethesis.