Fixes for Guid based indexes.