added ifdefs
Minor things