Updates to get IT to work

Change-Id: I536049174025912d0da04d5b7d1ed1919c4da334