SQL repo fixes for GetOrCreateComponent