US640 - IE fixes
US640 - IE fixes