address a few places w/o #ifdef ... #endif