Added platform ifdefs