Fix guid issues