Just small fixes/tweaks

Thank you for your nice work on this extension!
Here is my little contribution.