Added some missing ifdefs
Merge