IPT Fixes