Small bug fixes

Just a few more bug fixes ;-)


Ready to start scanning?