Fixed various ifdefs.