Update some #ifdefs