Couple of fixes/clean up in Ironman