Enter/leave target fixes.