get check-mode logic right in a few places