more guid fixes