Small bug fixes

Just a few more bug fixes ;-)


Suggest an Improvement

Ready to start scanning?