more #ifdef fixups