Updates for ION build