fixes for my last changes of compiler conditionals,sorry