A few more bug fixes

This update contains a few bug fixes. Thank you for raising them!


Ready to start scanning?