Fixes #3921
Fixes #3842
Fixes #3643