Improved a few little things

[tetj]

I have verified that:

• [x] These changes work, by building the extension and testing.
• [x] That the changes comply with the rules indicated in the repository.
• [x] Pull request is targeting master branch.