Fixes #5246
Fixes #5243
Fixes #5245