More target fixes