Fix some bugs

71 jobs for !1453 with feature/override-collections in 123 minutes and 23 seconds (queued for 10 seconds)
latest merge request