Fix nits

Alex Pottrequested to merge
issue/entity_usage-3612700:3612700-fix-some-nits into 5.x

Closes #3612700

Merge request reports