Random remarks

Fixes #15954 and #16354.