GUID Bug Fix's