Some small fixes.

[jonathanimb]

Thanks so much for your work. It has helped me immensely. I discovered and fixed a few tiny problems.

[frallain]

Thanks for your feedback, that is much appreciated.