[ticket/11253] Fix a few things brought up in the PR