Prep for ITM fixes