Task Instance mapping tweaks