fixes, some debug instrumentation while looking at make check issues.