Added two more ifdefs