A couple of minor tweaks before allowing badge scans.