Fix non-ION build