Fixes #7410
Fixes #7408
Fixes #7437