minor fixes

2 jobs for !41 with GCP-implement-index-cleanup in 39 minutes and 14 seconds (queued for 2 seconds)
merge request