more minor undef warning fixes