Mods for ICE Conformance

continued work on [78753122](https://www.pivotaltracker.com/story/show/78753122)