Update some ifdefs