Fixes #3966
Fixes #3967
Fixes #3927