tweaks to make check mode work in DrR