fixing some ifdefs and some problems with previous merge
fixing some ifdefs and some problems with previous merge
fixing some ifdefs and some problems with previous merge
fixing some ifdefs and some problems with previous merge
fixing some ifdefs and some problems with previous merge