more #ifdefs fixed