Added a few #ifdef USE_ION