ION: Reverting some code and fixing compile errors