Fixed ifdefs