September bug fixes

Thanks again for the feedback!


Ready to start scanning?